Skip to content

Rollup of 4 pull requests #86023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 9 commits into from
Closed

Rollup of 4 pull requests #86023

wants to merge 9 commits into from

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

liigo and others added 9 commits May 20, 2021 14:54
@liigo
rustdoc: add tooltips to some buttons
375ca93
@GuillaumeGomez
Fix invalid align attribute generation on <td> elements
38ec87c
@tamird
Use iter::from_fn in String::remove_matches
db46d7c
@tamird
String::remove_matches O(n^2) -> O(n)
bc17b9c 
Copy only non-matching bytes.
@cr1901
msp430 linker does not accept -znoexecstack. Set linker_is_gnu to fal…
cd11cdb 
…se as workaround for now.
@GuillaumeGomez
Rollup merge of rust-lang#83515 - tamird:string-remove-matches-rev, r…
614dab3 
…=m-ou-se

String::remove_matches O(n^2) -> O(n)

Copy only non-matching bytes. Replace collection of matches into a
vector with iteration over rejections, exploiting the guarantee that we
mutate parts of the haystack that have already been searched over.

r? `@joshtriplett`
@GuillaumeGomez
Rollup merge of rust-lang#85503 - liigo:tooltips, r=GuillaumeGomez
e26b0db 
rustdoc: add tooltips to some buttons
@GuillaumeGomez
Rollup merge of rust-lang#85974 - GuillaumeGomez:td-align, r=jsha
cbe0bb2 
td align attribute

This is a follow-up of rust-lang#85972. I have put this one on its own because it changes the display:

![Screenshot from 2021-06-03 21-49-11](https://user-images.githubusercontent.com/3050060/120703622-d533d280-c4b5-11eb-9519-ea1131a40bee.png)

Without align:

![Screenshot from 2021-06-03 21-49-15](https://user-images.githubusercontent.com/3050060/120703623-d5cc6900-c4b5-11eb-95f9-878d3915c7fb.png)

I also opened an issue about it: pulldown-cmark/pulldown-cmark#533. However, I'm not sure if this is the right course of action... Should we instead ignore the warning?

r? `@jsha`
@GuillaumeGomez
Rollup merge of rust-lang#86014 - cr1901:msp430-link, r=jonas-schievink
b610b22 
msp430 linker does not accept -znoexecstack. Set linker_is_gnu to fal…

…se as workaround for now.

Tested locally and works. Closes rust-lang#85948.
@rustbot rustbot added the rollup A PR which is a rollup label Jun 5, 2021
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=4 rollup=never

@bors
Copy link
Collaborator

bors commented Jun 5, 2021

📌 Commit b610b22 has been approved by GuillaumeGomez

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 5, 2021
@bors
Copy link
Collaborator

bors commented Jun 5, 2021

⌛ Testing commit b610b22 with merge 22173d79e0d51413db2ac36f8ed42e59bf036286...

@rust-log-analyzer
Copy link
Collaborator

The job dist-i586-gnu-i586-i686-musl failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
thread panicked while panicking. aborting.
error: test failed, to rerun pass '-p alloc --test collectionstests'

Caused by:
  process didn't exit successfully: `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/i586-unknown-linux-gnu/release/deps/collectionstests-b7619a21b3e02624` (signal: 4, SIGILL: illegal instruction)


command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "i586-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "16" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace compiler-builtins-c" "--manifest-path" "/checkout/library/test/Cargo.toml" "-p" "alloc" "--"


failed to run: /checkout/obj/build/bootstrap/debug/bootstrap --stage 2 test --host= --target i586-unknown-linux-gnu,i686-unknown-linux-musl
Build completed unsuccessfully in 0:23:20

@bors
Copy link
Collaborator

bors commented Jun 5, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 5, 2021
@GuillaumeGomez
Copy link
Member Author

No idea if #83515 or #86014 is responsible here... Let's see which one will fail on the CI then!

@GuillaumeGomez GuillaumeGomez deleted the rollup-3peyj71 branch June 5, 2021 14:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@GuillaumeGomez @bors @rust-log-analyzer @rustbot @liigo @tamird @cr1901